Merge "Make der-oid-macro available to product and vendor am: aca976d39e am: 6268cc482b am: 61e9d54a59 am: 0135fbb76c am: c88247f907"