Reconcile with ics-mr1-release

Change-Id: I5dc5f4d1a72b6aebe870a833c84e575120c78cdf