Merge "Fixing build breakage due to proto compiler change" into ub-launcher3-master