Reconcile with ics-mr1-release

Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958