am 81304325: Reconcile with ics-mr1-release

* commit '81304325161a14e9f9908def807114b33b13dce6':