Merge 78e82f2f22f0fbf2310ad8a664ea24c4b27783c1 on remote branch

Change-Id: Ifa17579e60b0a0d9ecdee4a562a450c436b4b439