Reconcile with ics-mr1-release

Change-Id: Ica26c90c34d9665dfd68e404893a306d43aface3