am 36e0e88c: am 81304325: Reconcile with ics-mr1-release

* commit '36e0e88cd695373cfeef9da13bace61425801787':