Merge 4ea040c03215b634baf23cd696f706d6110d72c6 on remote branch

Change-Id: I8b22c4bf30fd3e937d4f138e6a354f3e36ee4409