Merge "Add missing break statement." am: 7a4b88de49 am: 080456edd6
am: 5d2af16008  -s ours

Change-Id: Iac5e03fa786cfef832dd8a77b6208a0bf9a1a3f0