Fix couple of instances of undefined behavior

These were found by running tests using clang's -fsanitize=undefined

Change-Id: I810be9c747504df671629201ba56b5b8ed2307d7
5 files changed