Merge af30f0103a50df510a71a12047b5c68b4e3b8a72 on remote branch

Change-Id: Ic264317336ccafd9d4a1a9d67111f121cf49053a