Merge "Tweak for b/37809561." into oc-dev