This reverts commit 0ea67d82. Bug: 64345190 Change-Id: I353c064db7bfaf91e98b5fd0d3e7180381a1b2b8 Test: n/a