am 6d70d105: am 22e830cd: Reconcile with ics-mr1-release

* commit '6d70d105643d1caa8098b3b1cd987d7c39d321a9':