Merge "Use valid metadata keys for compute images"