am f868dc27: am 5477d33e: Reconcile with ics-mr1-release

* commit 'f868dc272b14b516daa5a144bd689b418acba599':