am 5b85b190: Reconcile with ics-factoryrom-2-release

* commit '5b85b1900c9b58db7642db2d189766767fc259be':
  ITL31