Reconcile with ics-mr1-release

Change-Id: Iec77a08e2e278e1fd82f3a476e278575f47234ad