Reconcile with ics-mr1-release

Change-Id: I3e37d2f53e787398ad3571e8c461adbcf3d26c4c