Merge dd2ab0ee386c09906b48894599c7666cdcaf7695 on remote branch

Change-Id: Ifa86b0d54122592e6d0a9d60545bebbf4e6d042a