am 5f8099ed: Merge "Add java.util.List import."

* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
  Add java.util.List import.