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

* commit 'bba9d27e0c2d59e77bf51872b8773b962ea4b4c1':
  Remove memory leak in PersistentDataBlockService jni