am 21e30a88: Reconcile with ics-factoryrom-release

* commit '21e30a887b573a9187b8fcd9c3b04e6f8da8034a':