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

* commit 'd50bc1bb3cd1ba5406dfc0b99bc3030bb8ae6ae3':
  ITL27
  ITL26B