am 4627a47d: Merge "Remove obsolete imports"

# Via Android (Google) Code Review
* commit '4627a47d94a5322b9a3cea02645929b260a6ee16':
  Remove obsolete imports