am 05d10ed4: Reconcile with ics-mr1-release

* commit '05d10ed415f5025e6ee6cf657184c1455d03d2a4':