Merge 9c7126f91571f87bbc1b6537a397521d3cb53f76 on remote branch

Change-Id: Iead6c70d568670d312defae527dd8330a6ab0cba