Reconcile with ics-mr1-release

Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60