Merge 7e5c05ff73b551b0b2f6f9f0d87a4beb79fd6477 on remote branch

Change-Id: Ie3677850b462a95fadbe9d10b4b7f0d98bea262f