Merge "Fixing build." into ub-launcher3-burnaby