Merge "Revert "Temporary workaround for b/122369337""