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

Change-Id: Ia0c4b3b3f72f6447ab90a011f1967c5b18e3a51f