Merge "CAB assets" into ics-factoryrom