Merge 540a3cd9528a293c9e6c4be808dac3e2dd7be259 on remote branch

Change-Id: I8626231640b3cc5aaeec4ffc26a51e63223ebb9a