Merge a0044f53cc6d976ddb1f4c7f6f3249e8917db850 on remote branch

Change-Id: I5acf767e2f05ec63b617f388362ff3e9d84f7b56