Reconcile with ics-mr1-release

Change-Id: Ie2d407218a8d9853501690ce703b2c8f54e0d075