am f12af838: am 543bb7b0: Reconcile with ics-mr1-release

* commit 'f12af838c823814738f40f1e8bb3c6ec049ab7b6':