Merge a5e56dd8ed6322f99d0d1695a4b0b6654d5035fb on remote branch

Change-Id: Iab585982886bbc6d859284b27a828d68649eae96