Reconcile with ics-mr1-release

Change-Id: Iabe8f7374f8e66b88775543fb58d075f13088cbd