am 8ac25b55: am bba9d27e: am 1d50879b: Merge "Remove memory leak in PersistentDataBlockService jni"

* commit '8ac25b5500277aadd1b29d36cd00617a4a82f76b':
  Remove memory leak in PersistentDataBlockService jni