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

Change-Id: Ib26b3eb7f3f3ee080271e42448eaea2a5287d9cc