Merge commit '80e69471'

Change-Id: Ifdb8ad7580c80f09cd55f6fefb712caca9b6b4aa