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

Change-Id: I6a1a4db15dbb3aa986506b1c0f70e03bc8eb5830