Reconcile with ics-mr1-release

Change-Id: I4ad3da51622d4d250e96cb19c63ad2da723d9e82