This reverts commit 1fdd6ca88a. Reason for revert: b/205289292 tracks the real fix for this Test: presubmit Change-Id: I5a2edaf4f930dafa26659f85d9425e9041c72275 (cherry picked from commit 1d016c50d0ee18ebc81ce7966e616b9936befd5a)
1fdd6ca88a
bf49705608
775f9e37c7