Merge "Fixing Test builds" into ub-launcher3-burnaby-polish