Merge 02170baa52615642f1bc997cf9dc7bc3fdbd0e24 on remote branch

Change-Id: Iae94c8b91b1a8e126944716d1a78adcf736b1f49