Reconcile with ics-mr1-release

Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7