Snapshot to 0bb982b594752ac7302459740cb2337e9f1779b1
Merge remote-tracking branch 'aosp/kitkat-mr1-release' into kitkat