am 1e1a4553: am ba50bbf6: Reconcile with ics-mr1-release

* commit '1e1a4553a840f3e2a4a179f7ea6ba728da60fad0':