Merge "Fix oversight when checking in last CL"