Merge a10713a084d7686af0b19886617c6f63e3d5fea6 on remote branch

Change-Id: Ia2e037cb3a36662e585379cc7ec3f9b4f1ed094a