Reconcile with ics-mr1-release

Change-Id: I7ffb95abed972c35aa091c41c9c4ec079f0512e1