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

* commit '09cecf6d853d38c48424f0f44e35708e262c5c78':
  Clean up unused code and import declarations