Merge 53af11b93dd6be72447774aa4e3bd23af7c16813 on remote branch

Change-Id: Iff8ccadc7d48d69fec1285bd0a31a6bc49723b9d