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

Change-Id: Ie27d6ee76a7ab6585881d5f83c197ab99f7d26f4