Change-Id: Ic234ac3ac776e40fadcf4d3a65c511ceb3946666 (cherry picked from commit 91fee384ddf055a6689160c64fdbdcc5caf91325)