Merge 61e85a2c971ef5a05002b3733a4d35ad3caa74c2 on remote branch

Change-Id: Ibe449ec524b25a50187fc49a250480e873be017b