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

* commit '346718f4e71c22075ffe6c80787a704e477c7942':