Reconcile with ics-mr1-release

Change-Id: I85cff69674979b1c6b3e557ef1da2a42d363b0e6