This reverts commit 09724a75. Test: m Bug: 184281926 Change-Id: I6aa8eff8ab09ef8ebab58bb22f65203cb4349a48