Merge "Remove useless goto." am: b8ba80ebd2
am: d91c9eae3f

Change-Id: I5bfe3123e6dbdc07de269c7d0bc8cc4040bcf530