Reconcile with ics-mr1-release

Change-Id: Id851c6f9763feeed6615851ea9d680ba7b0e9a8d