Merge "Fix PersistableBundle C++ -> Java interop" into pi-dev