am 00eac093: Reconcile with ics-mr1-release

* commit '00eac09334b10af78e6b9ef9390f492cc74ad5e3':