Reconcile with ics-mr1-release

Change-Id: Ie670c123d7fe636bc2a6b441c4b42f74b1f326bc