Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev