Merge b114a0d7a0f5b1b9d15919f0079a70f1f7799ec6 on remote branch

Change-Id: Ia60aad3fedcea8da42bf1b68969d120f28f7a234