Merge "Prepare for enabling H302 rule (api/compute/admin)"