am ec3b4b72: am 719c9e02: Reconcile with ics-mr1-release

* commit 'ec3b4b725fc176a507e1da5156c4ff70f3cc8395':