Merge "Remove 'break's to make sure we see all options." am: 237377b48f
am: b8168f9e23

Change-Id: I2a2e821b80b808cdc6686eb4ca8dd05097b76ee5