Merge 1863667c8f93542f42b7d28be5eb5b7b9c57a51c on remote branch

Change-Id: I88a872c3d9fa1694c468cae9204da5417e49886f