Merge "Add missing break statement in Sap message handling"
am: 225b6a286d

Change-Id: I7cbbc37a14956ec27e8ad8e56f3ea5c911dfca60