Merge "Missed a break statement. very sorry" into oc-dev
am: a2ee78aeb9

Change-Id: I0da645a6bdc05883c137930700a264d7a9aa4400