Merge c3ee6856580f052abcd2879aaa21225e56403bb4 on remote branch

Change-Id: I55f6bb15b618c2cef2f963d8b4c538f2094c6a4b