Merge "Make 129-ThreadGetId more robust."