Reconcile with ics-mr1-release

Change-Id: I4e19bff28a06ff642dc5ea3707bc943f7c318f0c