Merge 10ff9573a5e079efc87a79bba083517e97ed5295 on remote branch

Change-Id: I33b2b4dea2364e731dcd3215ca155aaddaecbf4b