Merge "Suppress -Wimplicit-fallthrough." am: 74d0fded75
am: 4f8f5703c2

Change-Id: I4d9855f9a039d114c241241728e0d1598dc6cac4