Merge "Add OEM specific addresses"