Merge b8f64e0977b67e887b67ad3d17491483b77b32a3 on remote branch

Change-Id: Ifb6e0cc5355c661bacd1da3036ea79b583be93ef