Merge "Cherrypick from hcmr2: doc change: fix typo in reference to new uses-feature constant."