This reverts commit 01cffc29. Reason for revert: causing b/65498626 Bug: 65457314 Fixes: 65498626 Change-Id: I47ddfcccaf94ceadf2104973402b3cdc50876a36