Reconcile with ics-mr1-release

Change-Id: I3451784a6887c3d4f82e6c124d28232b3b688d38