Reconcile with ics-mr1-release

Change-Id: I1730d5234696bbe526397f07d737d6ec18e8c81b