Merge bcd4453dbbe83e1a63253e45319b8e4e412a45e7 on remote branch

Change-Id: If2dbcc034ddff337ae4152d117187a6a3f6dd00c