Merge "Fix rosalloc issues with valgrind." am: ad736f19b4
am: 880744da14

* commit '880744da142f955a16148aad486fd743934a5723':
  Fix rosalloc issues with valgrind.