am 5a903cd0: am 6dee1a9d: Reconcile with ics-mr0-release

* commit '5a903cd0b6e7c52ffeb01aadfc55eb78e4fa72e6':