Reconcile with ics-mr1-release

Change-Id: I0c626aac7eaf78e51a657b4e71c406dda3556c37