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

* commit '1d50879b1d183d4caa15b9685515b5f959213fe9':
  Remove memory leak in PersistentDataBlockService jni