Reconcile with ics-mr1-release

Change-Id: Ide3a3c13469bf86114acbe443efe02f5b86743b8