Merge f6a39426972d7fea7e6297204f2271dd5b098725 on remote branch

Change-Id: Icf2e4e00b986ecea13040455036ec9018c68dc4b