Reconcile with ics-mr1-release

Change-Id: Ie5b83f7f71c9407a451572d9ba0d4609e4bf597f