Merge 73a3ad572a8747351b8099e0cf3533f8c0979367 on remote branch

Change-Id: Ied4b0dd9f7652b25f16b07c3be0d4b1a1a11e363