This reverts commit 4dc3289c. Reason for revert: Pushback from bundled apps. Bug: 68841055 Bug: 34520588 Change-Id: Id771a11c9b44baf5810240cca164bae9f468b5ad