Reconcile with ics-mr1-release

Change-Id: Iefafbf68db366745b51f0d62473baa62e84c01ce