am eae3f0fe: am 80a37e9a: am 34671b81: Merge "Remove some gotos"

* commit 'eae3f0febd1fb5e1b0b5f89826e8f13c6d6a67b0':
  Remove some gotos