Merge "Fix PermissionInfoTest#testPermissionInfo" into jb-dev