Merge "More preparation for enabling inproc presubmits" into ub-launcher3-master