Merge commit '451b577ddfde5496c447f939051287e825d37c55' into m

Change-Id: Ie5dc4b6b5e94c2b125f742b232b2fc5e3bcb2343