am b5b2307f: Merge "Fix PermissionInfoTest#testPermissionInfo" into jb-dev

* commit 'b5b2307fc7eb12c13209c929fac86b23252b78dc':
  Fix PermissionInfoTest#testPermissionInfo