Merge "Fix PersistableBundle C++ -> Java interop" into pi-dev
am: 640d4d5f43

Change-Id: I19f22ba45a3dd84f96d395fe95df9081b8d62166