C++17 compatibility: unreachable break. am: b7037ae1b3 am: 77d5e1d3c9
am: 8b04b5aabf

Change-Id: I4a1b7c0c68d1b0a682568cc03512bda61162f772