Reconcile with ics-mr1-release

Change-Id: I65fa0ab7a8aa7c6bc0f065618a5ca1c05e318332