Reconcile with ics-mr1-release

Change-Id: I74a51ed7639683e0ab67c922b954eb1391dd2a49