Merge "Remove memory leak in PersistentDataBlockService jni"