Merge "More flexible API enforcement policy." into pi-dev
am: c6d9f7ce1d

Change-Id: I397333316f8afaee0e2591afdf336325532bd2ed