Reconcile with ics-mr1-release

Change-Id: Ie9e79a16a3541f85ef9d1a7ffd4fe470c3570a16