Merge a1dbeb8d51d61d050694ac92f0a2b99af0ac919b on remote branch

Change-Id: Ide9c6cede1a55797ba537764144a228f2c289e86