Merge "Fix implicit fallthrough warning."
am: 0f455238b1

Change-Id: Idb88c71d8087f1fd5a5d8fa40a44609496122aac