Reconcile with ics-mr1-release

Change-Id: I4b725ae1b482e0dd54d7646f24663c8492c2d049