am 054a457c: am dff907ec: Reconcile with ics-mr1-release

* commit '054a457c105dfc7d2c9e0af5576f7e480c7c83e0':