am 3f9a60cc: Reconcile with ics-mr1-release

* commit '3f9a60cccc7498f369edb0ef490b41e9ac983842':