Merge remote-tracking branch 'AOSP/kitkat-mr1-release' into kk-ras-mr1.1
Merge remote-tracking branch 'upstream/kk-ras-mr1.1' into kk44.1-test