Merge "Turn off aosp_cf*_auto builds" into pi-dev