Merge cc20cc3d5d1cdbef4fa2a213d799c60159180276 on remote branch

Change-Id: I928720cdc576a641a80e03b6609ab8910cc5b2c3