Reconcile with ics-mr1-release

Change-Id: I82d41f26a2d41e6be426cf04d4f29f21c8c8413a