Merge 5af6659a94698e0bc3257b221bacfad5c75edcf3 on remote branch

Change-Id: I1a0c750e983bfd64886a214f81dee7c5e22ce427