Merge 17443f5f61a72e6bd3ee85e5f55d24ab14618de8 on remote branch

Change-Id: If2c22da972d49d7fb08eab44e70b87c38d9519f9