Merge be5c975da59e80e46ca40a8bbdc76549f677e124 on remote branch

Change-Id: I04c40483a86183db5f62f715abcf1cade33a42a7