Merge remote-tracking branch 'AOSP/kitkat-mr1-release' into kk-ras-mr1