Merge "Add feature flag for b/110953234 fix."