Merge a52b1ea83a3b4c73ff050b2e363c2b643f20cdd6 on remote branch

Change-Id: Ie4857421b8bd9af9ab1b2d102f1370d2584c5b46