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

* commit 'a0d741e22490a621325e690d9d5d4fe2ca489d63':
  Fix PermissionInfoTest#testPermissionInfo