Reconcile with ics-mr1-release

Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3