am 77abe8bd: Reconcile with ics-factoryrom-2-release

* commit '77abe8bdf4f88594e3a042dd563736d61d2b44a5':