Reconcile with ics-mr1-release

Change-Id: I4b78781b7fc2d280e633586f53572e639fc7cd90