Merge "Add missing break statement."
am: 7a4b88de49

Change-Id: I3323063130b71f831d7c6356d0657161f84c9e38