acb907fb0d
This reverts commit f4b34b6c3942be273ad7298a40be0d312b183aab. The revert was only meant to apply to the jb-mr1 branch, but accidentally leaked out into AOSP. This revert-revert gets AOSP master and internal master back in sync.