Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev