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

* commit 'a01902ffbd51d4952efb0794853a1c0dc2f8c353':
  Clean up unused code and import declarations