Merge "Define OWNERS for permission grant changes."
am: 8d2a5bd42a

Change-Id: Ib91c1ecc3d673ba103f966008609d2444107eb7e