This reverts commit 34b769d3. Reason for revert: b/73663127 Change-Id: I8595039777d69994f6fcc1f9a6911d202c8adbbf