Reconcile with ics-mr1-release

Change-Id: I68d3e0b11d1f4d5210e2c5b312e1137422b4987d