This reverts commit bd43b9344f. Reason for revert: b/328782012 Change-Id: I1666fbd63d82da06ed8c3d9ce58b5ed6b298618b
bd43b9344f