Merge 0455a053b4e386d88417d6de846d1be2bf73d6a4 on remote branch

Change-Id: Ifb29fdd4c9819e7df9707fa0866c8905bc60b225