It's now simple as ALLOWED_SERVICES and COMMON_PREFIXES have gone. Partial-Bug: #1501793 Change-Id: I15a3804db47d635260f92370ba4489ef0d0e2194
Partial-Bug: #1501793 Change-Id: I4d6bd79f52e16309e1f785c9afc78b4baff3256e