(after break) for switch statement

This should help resolve conflicts on merge with master, all files
touched by this commit should be considered merged (so just use the
BETA_JAVA13 version).

Change-Id: Ic3980023e0e56830a138ff09b70168e312038422
Signed-off-by: Mateusz Matela <mateusz.matela@gmail.com>