Merge "Revert "Work around b/70221552""