Reconcile with ics-mr1-release

Change-Id: I54de2715453d84a4f2b5a1ca280d4a1fc5a692bf