Reconcile with ics-factoryrom-release ics-mr0-release

Change-Id: Ic2b248f0ade713e7ba984cbe093afe50bc931ad2