Merge commit '4ea030cc240f0b35858d1a4060cb5b0465ea0521' into HEAD Change-Id: I7b8e11d89b24ccf12d21eb80bd4114c8e830ec58