Merge "Removing temporary tweaks to make tests pass in presubmit" into ub-launcher3-master