Reconcile with ics-mr1-release

Change-Id: Ie79c241eb02aec0fb89ed8cbea1de82c0b29972f