Merge branch 'google/kitkat-mr1.1-release'

Change-Id: I6d2c18d15b8f09c5ddf3332827cb82e9b0b319a6