Merge "Remove useless goto."
am: b8ba80ebd2

Change-Id: I6a47e60d3b68180a14afcd1ec80d2f71fb1abfd2