Merge "Allow implicit-fallthrough warnings locally." am: e45fc974db
am: 7da8404d40

Change-Id: I444699f6638d7659228565b1fd660d9ffa20bb1b