Reconcile with ics-mr1-release

Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a