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

Change-Id: Id0c452f06faa036a7de81079ade5c4737423f4de