am 1c0f94c5: Reconcile with ics-factoryrom-2-release

* commit '1c0f94c5916921ee861933e080d7b0f711b019e1':