Merge 04625d39b189aacb689496abf4c7b48d1d979657 on remote branch

Change-Id: I200d4b67fefa09d43276f0044308407b1a3201c1