This reverts commit 1a5eeb3e. Reason for revert: Fix landed in aosp/1122723 Change-Id: I8b487d602d48b9dba35affc8eb31578efd815e52