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

Change-Id: I6536ef7e772cf1403131bd29e04a562b91d4d46b