Remove unreachable code, "break" after thrown exception

Change-Id: If8840128c056f6ad74fe7dff9ae9ac2adae91d41
Merge "Remove unreachable code, "break" after thrown exception"