Merge "Modify JVPP artifacts"