This reverts commit 991fabbc. Reason for revert: b/148087431 Bug: 148087431 Change-Id: I6bb8f7b12f8c422d1c58dca4412598422ab2fd79