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

* commit '80a37e9abd9a9fa7d262280a37195dc3e9ff50da':
  Remove some gotos