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

Change-Id: I3f3e031dc2e7a717d6bec6beb7815a30ce3d836d