Merge 04625d39b189aacb689496abf4c7b48d1d979657 on remote branch

Change-Id: Ic18b0034827a1b0a685eb741d2f29fd5b6fb7269