ordering cycle prevents google-startup-scripts from running

New Ubuntu 1604 images (ubuntu-1604-xenial-v20160922) do not have functional startup scripts.

$ dpkg-query --show gce-startup-scripts cloud-init
cloud-init 0.7.8-1-g3705bb5-0ubuntu1~16.04.1
gce-startup-scripts 1.3.3-0ubuntu5~16.04.0

$ journalctl | grep -i "ordering cycle"
Sep 26 10:07:43 ubuntu systemd[1]: multi-user.target: Found ordering cycle on multi-user.target/start
Sep 26 10:07:43 ubuntu systemd[1]: multi-user.target: Breaking ordering cycle by deleting job google-startup-scripts.service/start
Sep 26 10:07:43 ubuntu systemd[1]: google-startup-scripts.service: Job google-startup-scripts.service/start deleted to break ordering cycle starting with multi-user.target/start

$ systemctl cat google-startup-scripts.service
# /lib/systemd/system/google-startup-scripts.service
[Unit]
Description=Google Compute Engine user startup scripts
After=local-fs.target network-online.target network.target
After=google.service rsyslog.service cloud-final.service
Wants=local-fs.target network-online.target network.target cloud-final.service

[Service]
ExecStart=/usr/share/google/run-startup-scripts
KillMode=process
Type=oneshot

[Install]
WantedBy=multi-user.target

Related bugs:
 * bug 1627436: private bug issue was originally reported under