am c90961d4: Reconcile with ics-factoryrom-2-release

* commit 'c90961d43102563b540d719e637905570f9856e4':