This reverts commit 17b1001282. Reason for revert: I'll resubmit in AOSP, with the fix for the test included. Change-Id: I5bd63a5341a9b67ce63ec34080de13ed9203eba6
17b1001282