Merge "Handle /oem and /vendor as well"