Merge remote-tracking branch 'aosp/kitkat-mr1-release' into kitkat

Change-Id: Ifbeac578c40d18ddd01ad515b5b1ab64a3f6125c