Merge commit '9c045e49152040db37c827c238bbb7a4400bec1e' into HEAD

Change-Id: Ia58699cd527c0851868f948e4aa2def40f15223c