am 2fc1b62a: Reconcile with ics-mr1-release

* commit '2fc1b62a9cacfc28fc6a8b4b1e42a1aded82ca23':