This reverts commit 76c1707c. Reason for revert: TH coverage is bad. Bug: 73513670 Change-Id: I68ea45433d9ad16298073c1debeef7cf7467bd50