am 1df462b1: am 346718f4: Reconcile with ics-factoryrom-2-release

* commit '1df462b1723994562cdbc4e382c1ab5fb82c7709':