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

* commit '946d115867dacca1f8ec59fed10091c80e8cf728':