tree 4af924120c4f753f3c28e4a6ca4069ed673bfb87
parent f6a78079a81a177a3edebc9980829cbf39bf6655
parent bb3df38a46dff192e384cf5848cc4b61302722be
author Greg Hartman <ghartman@google.com> 1500940492 -0700
committer Greg Hartman <ghartman@google.com> 1500941125 -0700

Manual update to OPP4.170623.014

This preserves the following CLs:

  ag/I2b3c2ac44209772b38f383ae46fe6c4422b542cf
  ag/I3d0c8a2d416a25c45504eda3bfe70b6f6e09ab27
  ag/If5723ff4a978e17d828a75321e8f0ba91d4a09e0

  git diff d950b7b5f303a534313070cfbee66f6ab0d05c16 > /tmp/patch
  git reset --hard f6a78079a81a177a3edebc9980829cbf39bf6655
  git merge -s ours goog/oc-gce-dev
  patch -p1 < /tmp/patch
  git commit -a --amend

BUG: 63999151
Change-Id: I8719c9c733d499d2570a9c1547201262ee4df5e7