Merge 36afde1a2d5484d8dd2c353d7fa496428e7470a5 on remote branch

Change-Id: I78af5e8e8eac73755c6f1c6541a3d653fb3639b4