Reconcile with ics-mr1-release

Change-Id: I1c11ccb0df06a34bb60db6e1f6b06d639c6abcdb