This reverts commit fe37acae729529b8bf3a3140fa397bddce42b1e0 There are two bugs that are weekend release blockers: b/6357558 b/6357880 6357558 is easily fixed with: https://android-git.corp.google.com/g/#/c/182228/ But there are still questions. Bug 6357880 has unknown causes at the moment but this change is the most likely candidate. So for today's pre-weekend build we are reverting this change.