Reconcile with ics-mr1-release

Change-Id: I028e92611bbe6a091de34d99aa58e04b5bcf4892