am 26cc4ddd: am 8534a2a7: Reconcile with ics-mr1-release

* commit '26cc4ddd0d0cb40a45918b30fb057e9d224f581d':