am 2bf8e9ee: am 66e6a523: Reconcile with ics-mr1-release

* commit '2bf8e9eeada6932f212185eb2590ff02bbd046ef':