Merge be8c0d87a48f0294476d64cd1d9d7017e825e7b8 on remote branch

Change-Id: Ie1f983af944b2a7559f1f6469f37681f79cebe1c