Change-Id: Ic8c5c4e176618c245211e59000dd72c2af6b1e79 (cherry picked from commit aae10bae71e8709e1b903ae57b89d956b57c9fd6)