Revert "Merge remote-tracking branch 'upstream/kitkat-mr2-release' into kk44s"

This reverts commit 11bd72ea23b0e606ecac4f125096603f028cfab3, reversing
changes made to ab337ff74d63368367f2a29f069f9e1574984c2f.