Merge "Removing is_retrofit code path" into main