Merge "Remove workaround for b/141747409"