am 2fde4bf8: Reconcile with ics-mr1-release

* commit '2fde4bf8312ee8e8d67aa03a441bbd7783b132db':