Reconcile with ics-mr1-release

Change-Id: I506a39c186fba8f9a91691e1aed6f900f51b12d6