Reconcile with ics-mr1-release

Change-Id: Iab48fe998ee0d4add323a319afe32b82d7f07fb1