Reconcile with ics-mr1-release

Change-Id: I1d85842517e1dae6a18f9290fca5857698d1c365