Merge 4aa662eec61a6fa04103e2a664f07ab7f29ea0f4 on remote branch

Change-Id: I1d3a90efc6f47f15b92a2889641bfaa9bbb0031a