Merge 451f0552b8d2b15ddad94c3a28fcd6e3b1dd0789 on remote branch

Change-Id: Ib763cbeccc92d19c8f92bed89c08471f4a6e4eec