Merge "Update bic_client flag namespace to correct team." into main