Merge be8c0d87a48f0294476d64cd1d9d7017e825e7b8 on remote branch

Change-Id: I5dfbbf88e4cfb2f750ab32faf43ebaef95bcde04