Reconcile with ics-mr1-release

Change-Id: I5fc50124aca3226913fd31a2f4c44f0ef4cd886c