Merge 339ca6d55340b8545bd7f160691a36e9a52c194f on remote branch

Change-Id: Ib5837886050c25cce7cd9becc3f34afd3c59f4de