am 1650476b: am 9a38c83e: Reconcile with ics-mr1-release

* commit '1650476bd8ba41ef3bf630717cf954644bd5c1b0':