Merge "Fix test broken by 1454294" into nyc-andromeda-dev