Merge 2fa675b6221a8b29030cd51d830400174753a1b2 on remote branch

Change-Id: I1cb4e63d9dd174d2582affc080d4166c92a093e3