Merge "Build fix: Updating SDK for tests" into ub-launcher3-calgary