Merge "Preempt build error from merge with CL (2/2)"