This reverts commit 98bd9ace. Reason for revert: Breaks coverage build b/156892973 Bug: 156892973 Change-Id: Id00545e1b2179848d4324d7eacf18e3c3cc476ee