Merge d2e544028f18f22b71c9ff930f35dc3066853422 on remote branch

Change-Id: I0c2563dd1b555291c64ea29f3b4dbab8d9009250