Merge 5536cbdaa01eef9b8c61f1b4c2e0ccac9afe596f on remote branch

Change-Id: Ic82fba7df6fbeea8d454e4deb9850b6084bcd979