This reverts commit b1e46ff0. Reason for revert: Large instant app startup time regression. Bug: 112901509 Change-Id: Ic6fc9a82a92c5138f917f4389c7d334c640f3892