Cherrypicked angular-feature-flags fix.