This reverts commit 288c3ed3. Reason for revert: b/163447106 Bug: 162480816 Test: make Change-Id: I3dcf3e3324ecae1279a03bb28c58194227d93745