Merge "releasetools: allow for multiple OEM property values."