am 1cd74aca: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev am: 404a30d115

Original change: undetermined

Change-Id: Ic7a1a4f5199a19b7ac112ca99e7d53494d029073