am 682967e1: am d50bc1bb: Reconcile with ics-factoryrom-2-release

* commit '682967e1eef28e5a4d8e0cc1076ef9d4be9bdfc5':
  ITL27
  ITL26B