Merge remote-tracking branch 'remotes/aosp/kitkat-mr2-release' into kk44