Reconcile with ics-mr1-release

Change-Id: Id2d23c6a4e7b2815126ab9f4a5da133009706108