am 555459ec: am 9ebad5e3: Reconcile with ics-mr1-release

* commit '555459ec936478cec5dad5712f704788fc4c6bd2':