Snapshot to 3fac2c96ae27d71378b421affda0caef6e5572c1
Merge remote-tracking branch 'aosp/kitkat-mr2-release' into kitkat