Merge "Fix PackageInfoUserFieldsTest ClassNotFoundException"