am 48aca55f: Reconcile with ics-mr1-release

* commit '48aca55f665393d3389073d8b4299a6a30f41c6d':