Merge c73140f3c6ea56b99a54390402ed649ca5a14fec on remote branch

Change-Id: I00294ba9026811667347543425b1cbc2f38a8b61