am 49de3df7: Reconcile with ics-factoryrom-release

* commit '49de3df7d134adf1f53cd87c2e1317fcea8cdda1':