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

Change-Id: Iccd71c383788a21f12374d805cacbb3ff5b02771