am 2b7bf5d1: am e3281dc1: Reconcile with ics-mr1-release

* commit '2b7bf5d10c4fd516a2ec761fc4aa97a8f39a2f7a':