[automerger skipped] Merge "More flexible API enforcement policy." into pi-dev am: c6d9f7ce1d
am: e52db912c7  -s ours

Change-Id: I7c59442fffffe85bae98654c084b3c0511480ea8