Reconcile with ics-mr1-release

Change-Id: I1382f03a3a050b4a3dc173f63b8dea2be58b10a5