Reconcile with ics-mr1-release

Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2