Merge remote-tracking branch 'aosp/kitkat-mr1-release' into HEAD