Merge "Enable lunch command to pick up new toolchain version."