Reconcile with ics-mr1-release

Change-Id: I7652f038082b7a8de4a210854f755c3127f3370a