Merge commit '1aaaebb25db3ae24e6a55f89a1b9e19a8d6c0b99' into HEAD

Change-Id: Ic4d9f6fecaab8f00298d96ce5479ad2f41ea0597