am 78713c20: Reconcile with ics-factoryrom-release

* commit '78713c20577ea114309ebbba2c2e4e2bef953434':