This reverts commit c809730c. Bug: 78685119 Reason for revert: duplicate of ag/3982466 Change-Id: I05909f631d0e0942a80766e3250561040ad9956e