am 458d91b0: Merge "Prevent undefined behavior in RosAlloc."

* commit '458d91b0f72293c9dd347feecf535db0682ccd71':
  Prevent undefined behavior in RosAlloc.