Merge a11bdb87515e7795675efabf9958dc2e078658f4 on remote branch

Change-Id: Ic37b27679107b59300037284945ffd2fc73bdd0b