Merge 604e437f6f1615172baf9b18e3e2dfe779597723 on remote branch

Change-Id: If4e808b41683a4f30ae10ee5bed044c45096e03a