Merge "Use config provider for OEM MMI codes"