Reconcile with ics-mr1-release

Change-Id: I1316ee6433a4b594b3b0b7997c08a2a391cbae13