am 1e3fa573: am 2fc1b62a: Reconcile with ics-mr1-release

* commit '1e3fa573f03943afe5794993bdbe4f5c4528db7c':