Reconcile with ics-mr1-release

Change-Id: I1a5f95e7bab218fcf4565c57947e95bf21c2c500