This reverts commit e3d156a6. Reason for revert: b/206119621 Bug: 204136549 Change-Id: I380223b86660c27bea8f5dcc2d61f32df2704c02 Fixes: 206119621