Merge from: http://go/wvgerrit/69211 Cleanup unaligned code while working on b/117570686 and remove a duplicate break statement. Test: unit tests ./run_all_unit_tests.sh Bug: 121971420 Change-Id: I0ca1dc0fe54e7fe3a87aa7c8dac7ef9da04e90b2