am ebbee703: Reconcile with ics-mr1-release

* commit 'ebbee70305373d0ec1ae4f15dbb36eeb8f2521dd':