Reconcile with ics-mr1-release

Change-Id: Ie5631c4e3cd2d37d45f4a29a68f9285bf301fe9c