Merge remote-tracking branch 'goog/oc-gce-dev' into prerelease

Test: Local boot

Change-Id: I1ababa53f508c9669e364060a7e3de73e222333a