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

Change-Id: I827e9521aad9f1ab7fc0156c31dd4cb463d8b905