am 964faa35: am 3f3afbef: Reconcile with ics-mr1-release

* commit '964faa351815a86cf6832f261e71daf48af3d5c6':