Merge a10ad89300be5935429ba0545d13085467501731 on remote branch

Change-Id: I5362b790e1415c195efb0f2d4b316f821bac1a10