Merge 71ac14a7ee0babaa23892a70f01ccd416e6f8449 on remote branch

Change-Id: Ib08395018c71ac0ef06f2a77e620cecc4c18549c