Revert "Merge remote-tracking branch 'aosp/jb-mr2.0-release' into jb-mr2x-test"

This reverts commit 321baacfa7ac48e472768348b291e440fccef663, reversing
changes made to 3609014d43054d2bce275e86fbe2a3d7e2c55c0e.