Merge "Allow-list service-permission to not track latest api"