am 03363a27: (-s ours) am 554d902e: Merge "Memory leak and NULL pointer check fixes"

* commit '03363a273bf594a475696512505ae0229fce59de':