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

Change-Id: I32c2ddf0f6c5f21651750579e045198438045d12