am 4dfe8695: Merge "CAB assets" into ics-factoryrom

* commit '4dfe869520b83b79cc5912f5bd0061b0ec33aa11':
  CAB assets