This reverts commit 395e5054. Bug: 241941550 Bug: 241601211 Bug: 241011085 Test: Builds Change-Id: Ic2bb5d5dc52db743435defd129b5c2d0dc794d58