Reconcile with ics-mr1-release

Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a