Merge b1fd233b157166a3568ffe855bcb8a7a236e5b63 on remote branch

Change-Id: I43ea3c250d4557bc66cb3482aae1c2a839afdd8c