Reconcile with ics-mr1-release

Change-Id: Ie912a85bc61e6009462f43e4b936cbd80a01cdec