Merge 978eb819b860bc121477d9ea2cee8af40eaaa1d1 on remote branch

Change-Id: Ic89ce1821afdf6d827772ced0b671c21b13f604f