Merge "Fix various memory errors."
am: 29c54e37b2

* commit '29c54e37b225989a3adebf0feca1d574989a6c8b':
  Fix various memory errors.