Merge "Suppress -Wimplicit-fallthrough." am: b6963ddc47
am: 180ef32f6f

Change-Id: I62708ce214c248272f50e3bcffe7519b38af6c00