am cc8318cd: am afbbe46b: am 66f52a59: Reconcile with ics-mr1-release

* commit 'cc8318cdc85c36ed9e129f07f525e977008f6e93':