Merge 1e10c98a7bd676a07dc859b122836abd8ca3a49d on remote branch

Change-Id: I11f7683d4d835cecb2f03a83989d8a847ed3e07d