Merge "Merge "Add missing break statement" into oc-mr1-dev am: 3066d5acab" am: b1814b11d0
am: 4704f8b3ee

Change-Id: Ia9d80a736ae54fa192ad23d677a8a3f08116068e