Merge "Update API whitelist supported by parent profile"