Merge de6a5c6d91cd42b5a91a47965678095899ca5e21 on remote branch

Change-Id: If4170cb93d4be7e8300c2abb1c5a080ce55542a7