Change-Id: I2fe24c863f4c43471f46032ed15fcd5b98863fc1
...now that UnoApiMerge_types is gone. Change-Id: Ie33aeb09692e3b3d851f2278714b037e183b627c