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

Change-Id: Ie2f22f81e6d1d93903c12f165f5bdaf4a845d07e