Merge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah
am: 496548f784

Change-Id: Id89d0cadb3f676d4aee989d6e6a60272ff1eb694