Merge "Correct a permission check / add a test" am: 05cf3e896c

Change-Id: I770e101b009b86b8d94c5c6faa510baf042619b8