Moving forward to OPP2.170420.012

git reset --hard da33024086a12e43563271e6f4b65e9bb1717ac1
git merge -s ours goog/oc-gce-dev
BUG: 38009324

Change-Id: I7512747e316263f15291bff94b70ad4a9ed21385