am 7e38964c: Merge "Clean up unused code and import declarations" into ics-mr1

* commit '7e38964c43ecaca90b97d28e3190d71d19feeecc':
  Clean up unused code and import declarations