Merge \\"Add missing break statement.\\" into nyc-mr1-dev am: 29c4066935
am: f19877762a

Change-Id: Idcaf68d025cfa13aa4ac8d553dde720d66ee85dc