am 0aac1d69: am 9c81c0cb: Merge "Fix main space memory leak and add checks."

* commit '0aac1d69999a77d0de68b3f19f231b71452a8ea7':
  Fix main space memory leak and add checks.