Merge 52096bb4ba728232fa690b0cfaa607d4cd70df62 on remote branch

Change-Id: I078efee8725763d35827dd777253dcc0aed64220