Merge "Suppress implicit-fallthrough warning." am: 3f50316ea1
am: 310ff45982

Change-Id: I6161b5922610c6a7ce6727aead56f279e80e0e52