Merge "Clean up unused code and import declarations" into ics-mr1