This reverts commit cf0e3692. Reason for revert: Merge conflicts, should have been merged in AOSP Change-Id: Iee0a3e76c42858bcca45517e3ca02c65bc8eac0c