am f30b1b88: Reconcile with ics-mr1-release

* commit 'f30b1b886a4212656497145fd621376b5380ca28':