Merge 3ef0e5534b904c87b69ce37bc76cd5536c007607 on remote branch

Change-Id: I2cb8d5716df576daf19fd03f631fd83b3fd14fbc