C++17 compatibility: unreachable break.
am: b7037ae1b3

Change-Id: Ie712cbb3ebb3e856c9d846598988eb0d9ec97f44