Reconcile with ics-mr1-release

Change-Id: I9019782a7254c5f71ec9fe8c71a0b7b1a0c7f137