am 30f26f91: Reconcile with ics-factoryrom-2-release

* commit '30f26f912211751b4b28ac2f0e30af0430765214':