Reconcile with ics-mr1-release

Change-Id: Ib4dad2fa74bba05f93b481dfc19efeca63245d78