This reverts commit 14a4cc57. Reason for revert: b/152205774 Bug: b/152205774 Change-Id: I96034c7a3b175ec2c0bac67584179033f39fb117