am 3dcb459b: Reconcile with ics-factoryrom-release

* commit '3dcb459b1ba9d02c4be81c0712b4310eb48bd884':