am 156e3d17: Reconcile with ics-factoryrom-release

* commit '156e3d178ea66f6fde53dfac79fa646994df9891':