Reconcile with ics-mr1-release

Change-Id: I169da9f82d60659a6a8a4969571e46c65a12e23d