Ensure Conditional Builder produces valid class paths

Change-Id: Ibb07ea00a07c50de8a770695e24a57f26946726a
Merge "Ensure Conditional Builder produces valid class paths"