Merge bac7cebe705bdc1f7a639be15ab0979eda03d2d4 on remote branch

Change-Id: I64cc98d507ca6db3ad2a818904d5bb007a07f7db