Merge a411dcd6fc6a4382506e6073707fd6f0e0777e45 on remote branch

Change-Id: I6c7e3ee1fd1ea9f9c44a933e14bc2f6f333ca33f