Reconcile with ics-mr1-release

Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb